From 00fe68acc7b67999ac59c8c8dc4c2ff44423be26 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Wed, 19 Nov 2008 04:23:53 +0000
Subject: [PATCH] Remove scraggling conflict marker.

---
 testo | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testo b/testo
index f81aa1344..400638746 100755
--- a/testo
+++ b/testo
@@ -1524,7 +1524,6 @@ gpsbabel -i gpx -f ${REFERENCE}/track/tcxtest.gpx -o gtrnctr,course=1 -F ${TMPDI
 compare ${REFERENCE}/track/tcxtest~gpx-course.tcx ${TMPDIR}/tcxtest~gpx-course.tcx
 gpsbabel -i gpx -f ${REFERENCE}/track/tcxtest.gpx -o gtrnctr,course=0 -F ${TMPDIR}/tcxtest~gpx-history.tcx
 compare ${REFERENCE}/track/tcxtest~gpx-history.tcx ${TMPDIR}/tcxtest~gpx-history.tcx
->>>>>>> 1.210
 
 #
 # Memory-Map Navigator overlay files (.mmo)
-- 
2.30.2